merge from trunk
authorJoakim <joakim@localhost.localdomain>
Thu, 15 Apr 2010 09:20:03 +0000 (11:20 +0200)
committerJoakim <joakim@localhost.localdomain>
Thu, 15 Apr 2010 09:20:03 +0000 (11:20 +0200)
commit47903c4c290edaa42cc71812b9ca9794e3b23731
tree2aa8ed9bd99cb2e4abc86d96befc55fb856c4737
parent963295076503c44579de498fd4ce9ba106dae2e1
parent7b42630bd6dceeba82937790ba17ccbde82e22bd
merge from trunk
src/Makefile.in